tooltip-mode does in exist in emacs-nox #120

diff --git a/which-key.el b/which-key.el
index 04bb693a8806ddbc39450ec60a1087c7afde42fd..e4c8f714c4a917ae46082827320b9bf36b61d67f 100644 (file)
--- a/which-key.el
+++ b/which-key.el
@@ -1354,11 +1354,14 @@ ORIGINAL-DESCRIPTION is the description given by
                   (local 'which-key-local-map-description-face)
                   (t 'which-key-command-description-face))
       'help-echo (cond
-                  ((and (fboundp (intern original-description))
+                  ((and original-description
+                        (fboundp (intern original-description))
                         (documentation (intern original-description))
-                        tooltip-mode)
+                        ;; tooltip-mode doesn't exist in emacs-nox
+                        (boundp 'tooltip-mode) tooltip-mode)
                    (documentation (intern original-description)))
-                  ((and (fboundp (intern original-description))
+                  ((and original-description
+                        (fboundp (intern original-description))
                         (documentation (intern original-description))
                         (let* ((doc (documentation (intern original-description)))
                                (str (replace-regexp-in-string "\n" " " doc))